Skip to content

chore: merge updates from main into feat/bs5 branch#3752

Merged
NGPixel merged 46 commits into
ietf-tools:feat/bs5from
painless-security:main-merge
Mar 25, 2022
Merged

chore: merge updates from main into feat/bs5 branch#3752
NGPixel merged 46 commits into
ietf-tools:feat/bs5from
painless-security:main-merge

Conversation

@jennifer-richards

Copy link
Copy Markdown
Member

No description provided.

NGPixel and others added 30 commits March 10, 2022 12:57
Sessions with long names lead to poor rendering of the agenda filter buttons
on the 'customize the agenda view' page. This truncates those labels at 3 words.
fix: point the api index page into GitHub instead of trac/svn
* fix: point to GitHub for bug reports

* fix: point report bug link to template chooser

* fix: point report bug link to template chooser (2)

Co-authored-by: Nicolas Giard <github@ngpixel.com>
* chore: Remove svn/trac related infrastructure

* chore: Remove more svn/trac infrastructure

* fix: remove commented out Trac requirement
* feat: update the shepherd writeup template

Fixes ietf-tools#3580.

* fix: correct the version date
* chore: bring docker-compose to root level (ietf-tools#3642)

* test: match changes to release/about

Co-authored-by: Nicolas Giard <github@ngpixel.com>
NGPixel and others added 14 commits March 16, 2022 21:23
Fixes issue ietf-tools#3545
Conditionally tests if the approver is AnonymousUser, in which case
System is still used
# Conflicts:
#	.devcontainer/docker-compose.extend.yml
#	.github/workflows/build-test-base.yml
#	.github/workflows/build.yml
#	README.md
#	docker/app.Dockerfile
#	docker/configs/settings_local.py
#	docker/docker-compose.extend.yml
#	docker/scripts/app-init.sh
#	ietf/release/tests.py
#	ietf/release/urls.py
#	ietf/templates/500.html
#	ietf/templates/api/index.html
#	ietf/templates/base.html
#	ietf/templates/base/menu.html
#	ietf/templates/group/group_about_status_edit.html
#	ietf/templates/meeting/agenda_filter.html
#	ietf/templates/release/about.html
#	ietf/utils/tests.py
#	package-lock.json
Comment thread docker/app.Dockerfile Outdated
Comment thread ietf/templates/release/about.html Outdated
@NGPixel NGPixel merged commit 0250ea0 into ietf-tools:feat/bs5 Mar 25, 2022
@jennifer-richards jennifer-richards deleted the main-merge branch April 8, 2022 12:46
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Jun 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants